From c250dddb003414dfe827873497ae51267e995b0a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 5 Aug 2017 18:17:29 -0400
Subject: [PATCH] Use the right gettext domain

Most of our .ui files were still using the gtk30 domain,
despite the library having switched to gtk40. Fix this.
---
 gtk/ui/gtkaboutdialog.ui          | 2 +-
 gtk/ui/gtkappchooserdialog.ui     | 2 +-
 gtk/ui/gtkappchooserwidget.ui     | 2 +-
 gtk/ui/gtkapplication-quartz.ui   | 2 +-
 gtk/ui/gtkassistant.ui            | 2 +-
 gtk/ui/gtkcolorchooserdialog.ui   | 2 +-
 gtk/ui/gtkcoloreditor.ui          | 2 +-
 gtk/ui/gtkcombobox.ui             | 2 +-
 gtk/ui/gtkdialog.ui               | 2 +-
 gtk/ui/gtkfilechooserdialog.ui    | 2 +-
 gtk/ui/gtkfilechooserwidget.ui    | 2 +-
 gtk/ui/gtkfontchooserdialog.ui    | 2 +-
 gtk/ui/gtkfontchooserwidget.ui    | 2 +-
 gtk/ui/gtkinfobar.ui              | 2 +-
 gtk/ui/gtklockbutton.ui           | 2 +-
 gtk/ui/gtkmessagedialog.ui        | 2 +-
 gtk/ui/gtkpagesetupunixdialog.ui  | 2 +-
 gtk/ui/gtkpathbar.ui              | 2 +-
 gtk/ui/gtkplacesview.ui           | 2 +-
 gtk/ui/gtkplacesviewrow.ui        | 2 +-
 gtk/ui/gtkprintunixdialog.ui      | 2 +-
 gtk/ui/gtkrecentchooserdefault.ui | 2 +-
 gtk/ui/gtkscalebutton.ui          | 2 +-
 gtk/ui/gtksearchbar.ui            | 2 +-
 gtk/ui/gtksidebarrow.ui           | 2 +-
 gtk/ui/gtkstatusbar.ui            | 2 +-
 gtk/ui/gtktooltipwindow.ui        | 2 +-
 gtk/ui/gtkvolumebutton.ui         | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 0bb1ee6aa6..ac0bfa7aac 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAboutDialog" parent="GtkDialog">
     <property name="resizable">0</property>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 736694465e..4aac4d3f40 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAppChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Application</property>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index 3c0d9023c8..4cb9f300b3 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkListStore" id="program_list_store">
     <columns>
diff --git a/gtk/ui/gtkapplication-quartz.ui b/gtk/ui/gtkapplication-quartz.ui
index 1f48d0e976..92d01623bd 100644
--- a/gtk/ui/gtkapplication-quartz.ui
+++ b/gtk/ui/gtkapplication-quartz.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <menu id="app-menu">
     <section>
       <item>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index c75cb9908e..4c0db86f6e 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAssistant" parent="GtkWindow">
     <child type="titlebar">
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index bca006e28a..1494264319 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkColorChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select a Color</property>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index 9d3a67b158..725231e3c3 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtkprivate 3.10 -->
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkAdjustment" id="a_adj">
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index e6a25d2428..c67bfaacc8 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkComboBox" parent="GtkBin">
     <property name="expand">0</property>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 65d0e5ed8c..250bfb1a7c 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkDialog" parent="GtkWindow">
     <property name="window-position">center-on-parent</property>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index 7418e9379c..4b75045015 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFileChooserDialog" parent="GtkDialog">
     <property name="role">GtkFileChooserDialog</property>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index bf678809dc..bca73d6c94 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gtkprivate 3.10 -->
   <template class="GtkFileChooserWidget" parent="GtkWidget">
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index 66bfb3cf04..cff0c23f35 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFontChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Font</property>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 34f0abef7c..7bf0fc951f 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkListStore" id="model">
     <columns>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index 0fad0430c0..8473f15670 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkInfoBar" parent="GtkBox">
     <child>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index 6e8c3bfe8e..9332197a56 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.6 -->
   <template class="GtkLockButton" parent="GtkButton">
     <property name="can-focus">1</property>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index bec46b9b82..1213c3fb67 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkMessageDialog" parent="GtkDialog">
     <property name="title"></property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 71b2deab18..3eb6edd341 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkListStore" id="custom_paper_list">
     <columns>
diff --git a/gtk/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui
index 63b61f297f..9305ddba93 100644
--- a/gtk/ui/gtkpathbar.ui
+++ b/gtk/ui/gtkpathbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkButton" id="down_slider_button">
     <property name="can-focus">1</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 8281d37dd4..615109f92e 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkListStore" id="completion_store">
     <columns>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 69b5dfd708..d7628e675d 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <requires lib="gtk+" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
     <property name="width-request">100</property>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 0c63f977c2..d2076f0ed6 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.6 -->
   <!-- interface-requires gtkprivate 3.10 -->
   <object class="GtkAdjustment" id="copies_spin_adjustment">
diff --git a/gtk/ui/gtkrecentchooserdefault.ui b/gtk/ui/gtkrecentchooserdefault.ui
index 789c103800..8574f16d3e 100644
--- a/gtk/ui/gtkrecentchooserdefault.ui
+++ b/gtk/ui/gtkrecentchooserdefault.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkListStore" id="recent_store">
     <columns>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index c2f1b5bc53..b0e020f735 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gtkprivate 3.10 -->
   <template class="GtkScaleButton" parent="GtkButton">
diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui
index d3a1538012..7370142761 100644
--- a/gtk/ui/gtksearchbar.ui
+++ b/gtk/ui/gtksearchbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkSearchBar" parent="GtkBin">
     <child>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index f446134e4b..8cb6380dd8 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <template class="GtkSidebarRow" parent="GtkListBoxRow">
     <property name="margin-top">1</property>
     <property name="margin-bottom">1</property>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index b0191a300e..b99f52167e 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkStatusbar" parent="GtkWidget">
     <property name="hexpand">0</property>
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui
index b90048cebc..f6d3101241 100644
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkTooltipWindow" parent="GtkWindow">
     <property name="resizable">0</property>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index 799769fe45..ba78c9327b 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkAdjustment" id="adjustment">
     <property name="upper">1</property>
-- 
2.30.2